Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 22 Jan 2011 05:52:29 +0000 (21:52 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 22 Jan 2011 05:52:29 +0000 (21:52 -0800)

Trivial merge